Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reorganizing sources: move tlsn to toplevel, components to components #281

Merged
merged 1 commit into from
Jun 23, 2023

Conversation

heeckhau
Copy link
Member

No description provided.

@heeckhau heeckhau linked an issue Jun 21, 2023 that may be closed by this pull request
@heeckhau heeckhau force-pushed the 280-improve-code-organization branch from bf02ea4 to bd147df Compare June 21, 2023 18:57
@heeckhau
Copy link
Member Author

@sinui0 this PR moves the different components to a components subfolder.

I did not move the tlsn members to the toplevel. I tried that, but this resulted in problems inside the components folder, because the Cargo.toml file of tlsn was than treated as parent configuration file.
I guess we will only be able to do this, once we can combine everything in one workspace.

@heeckhau heeckhau requested a review from sinui0 June 21, 2023 20:16
@sinui0
Copy link
Member

sinui0 commented Jun 21, 2023

I did not move the tlsn members to the toplevel. I tried that, but this resulted in problems inside the components folder, because the Cargo.toml file of tlsn was than treated as parent configuration file.

You can avoid this using https://doc.rust-lang.org/cargo/reference/workspaces.html#the-members-and-exclude-fields

eg

excludes = ["components/*"]

@heeckhau
Copy link
Member Author

The problem is in the other direction. The components can no longer be build if the tlsn Cargo.toml file appears in the top folder.

error: failed to load manifest for workspace member `/Users/heeckhau/tlsnotary/tlsn/components/tls/tls-mpc`

Caused by:
  failed to load manifest for dependency `tlsn-block-cipher`

Caused by:
  failed to parse manifest at `/Users/heeckhau/tlsnotary/tlsn/components/cipher/block-cipher/Cargo.toml`

Caused by:
  error inheriting `async-trait` from workspace root manifest's `workspace.dependencies.async-trait`

Caused by:
  `dependency.async-trait` was not found in `workspace.dependencies`

Copy link
Member

@sinui0 sinui0 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, we can start with this at least, but we should look into how we can flatten tlsn. I'm quite sure there is a way to stop Cargo from tunneling up parent directories

@heeckhau heeckhau force-pushed the 280-improve-code-organization branch from bd147df to babf350 Compare June 23, 2023 07:18
@heeckhau heeckhau force-pushed the 280-improve-code-organization branch from babf350 to d18c342 Compare June 23, 2023 07:55
@heeckhau heeckhau merged commit a2334ee into dev Jun 23, 2023
11 checks passed
@heeckhau heeckhau deleted the 280-improve-code-organization branch June 23, 2023 08:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Improve code organization
2 participants